Install data files to libopencc2-data, drop -dbg package

diff --git a/debian/control b/debian/control
index b461cbe1261017472c72376fc12efe3d8dcc9328..dc6a34331dc5c0ee093435cb3aa598ce61b75ec1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -25,9 +25,9 @@ Section: utils
 Architecture: any
 Multi-Arch: foreign
 Depends: libopencc2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: simplified-traditional chinese conversion tool
- opencc is a library for converting character between traditional chinese and
- simplified chinese.
+Description: simplified-traditional Chinese conversion tool
+ opencc is a library for converting character between traditional Chinese and
+ simplified Chinese.
  .
  This package includes the conversion tool.
 
@@ -35,12 +35,10 @@ Package: libopencc2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: libopencc0
-Conflicts: libopencc0
-Description: simplified-traditional chinese conversion library - runtime
- opencc is a library for converting character between traditional chinese and
- simplified chinese.
+Depends: ${misc:Depends}, ${shlibs:Depends}, libopencc2-data
+Description: simplified-traditional Chinese conversion library - runtime
+ opencc is a library for converting character between traditional Chinese and
+ simplified Chinese.
  .
  This package includes the shared library.
 
@@ -49,20 +47,20 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libjs-jquery, libopencc2 (= ${binary:Version}), ${misc:Depends}
-Description: simplified-traditional chinese conversion library - development
- opencc is a library for converting character between traditional chinese and
- simplified chinese.
+Description: simplified-traditional Chinese conversion library - development
+ opencc is a library for converting character between traditional Chinese and
+ simplified Chinese.
  .
  This package includes the development support files.
 
-Package: libopencc-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Multi-Arch: same
-Depends: libopencc2 (= ${binary:Version}), ${misc:Depends}
-Description: simplified-traditional chinese conversion library - debug
- opencc is a library for converting character between traditional chinese and
- simplified chinese.
+Package: libopencc2-data
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Breaks: libopencc-dev (<< 1.0.4-3)
+Replaces: libopencc-dev (<< 1.0.4-3)
+Description: simplified-traditional Chinese conversion library - data files
+ opencc is a library for converting character between traditional Chinese and
+ simplified Chinese.
  .
- This package includes the debug symbols which is useful when debug.
+ This package includes the data files.

diff --git a/debian/libopencc-dev.install b/debian/libopencc-dev.install
index b9fc88b7feacc8f1c72d5386724df01ccc0ffa62..7df81cd9f2a1282cd8d7222dd9b841258c579f78 100644 (file)
--- a/debian/libopencc-dev.install
+++ b/debian/libopencc-dev.install
@@ -1,4 +1,3 @@
 usr/include/*
 usr/lib/*/lib*.so
 usr/lib/*/pkgconfig/*
-usr/share/opencc/doc/*

diff --git a/debian/libopencc2-data.install b/debian/libopencc2-data.install
new file mode 100644 (file)
index 0000000..730f46f
--- /dev/null
+++ b/debian/libopencc2-data.install
@@ -0,0 +1,3 @@
+usr/share/opencc/doc/*
+usr/share/opencc/*.ocd
+usr/share/opencc/*.json

diff --git a/debian/rules b/debian/rules
index 66282eeec09bf977090ceb218c1ba7ecfd2bd732..af50c7c15604c089f3af563fba96a3ce3704cb8c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,3 @@ override_dh_auto_install:
 override_dh_auto_clean:
        dh_auto_clean
        find . -name *.pyc -delete
-
-override_dh_strip:
-       dh_strip -plibopencc2 --dbg-package=libopencc-dbg
-       dh_strip